Repository navigation
[release-branch.go1.25] Restore go1.25.14 - #2721
Merged
Davis Goodin (dagood) merged 1 commit intoNov 11, 2026
Merged
Davis Goodin (dagood) merged 1 commit into
Davis Goodin (dagood) merged 1 commit into
Conversation
|
Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The go submodule remains pinned to go1.25.6 despite the VERSION change, so clean checkouts use outdated source against which the restored vendor patch will fail to apply.
1 open issue
What changed in this PR
Partially reverts #2702 to prepare the Go 1.25 release branch for possible future builds, while retaining patch-index tracking for conflict resolution.
Changes:
- Restores
VERSIONto go1.25.14 and adjusts patches for the newer source. - Removes the SMTP certificate and CNAME test backports.
- Refreshes patch checksums and retained index metadata.
| File | Description |
|---|---|
VERSION |
Restores the declared version to go1.25.14. |
patches/index.json |
Updates patch metadata and removes deleted patch entries. |
patches/0016-net-fix-TestLookupCNAME.patch |
Removes the CNAME test backport. |
patches/0015-net-smtp-prevent-test-failures-due-to-expired-test-c.patch |
Removes the SMTP certificate test backport. |
patches/0011-Implement-ms_tls_config_schannel-experiment.patch |
Refreshes Schannel patch context and index lines. |
patches/0004-Use-crypto-backends.patch |
Refreshes crypto-backend patch context and index lines. |
patches/0001-Vendor-external-dependencies.patch |
Aligns vendor patch context with newer upstream dependencies. |
Review effort: Balanced
Quim Muntal (qmuntal)
approved these changes
Nov 11, 2026
Davis Goodin (dagood)
enabled auto-merge (squash)
November 11, 2026 19:01
Davis Goodin (dagood)
merged commit Nov 11, 2026
ad4b81a
into
microsoft/release-branch.go1.25
32 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

This puts the branch in a good state to develop a future 1.25 build, if necessary.